merge r20935
authorJo-Philipp Wich <[email protected]>
Fri, 16 Apr 2010 19:09:39 +0000 (19:09 +0000)
committerJo-Philipp Wich <[email protected]>
Fri, 16 Apr 2010 19:09:39 +0000 (19:09 +0000)
commitd95d5eaede6788a40d2855af02c9f97a81bd990c
tree715d9f60a7df773cc91e530801d86a4709a6e60b
parentb09ef662479ea3f4448029855e41025d9c308e7a
merge r20935

SVN-Revision: 20936
package/dnsmasq/Makefile
package/dnsmasq/files/dnsmasq.init